auto merge of #301 : alexcrichton/cargo/lockfile, r=wycats
authorbors <bors@rust-lang.org>
Fri, 1 Aug 2014 22:29:29 +0000 (22:29 +0000)
committerbors <bors@rust-lang.org>
Fri, 1 Aug 2014 22:29:29 +0000 (22:29 +0000)
commit808567e1fff8735c0487ebc43aa4f9fd4a253ae0
tree5bff12730e9d3d71d52d66bc2cbf935ea9520031
parent01b7c755e92f3208a2cb75b14552a9fc2f30340d
parente18c557d05dfb0db2445f31127593511a2258bf0
auto merge of #301 : alexcrichton/cargo/lockfile, r=wycats

This PR is a series of commits building off the `lockfile` branch which finishes the work on the lockfile as well as implementing the `cargo-update` command.

This PR deprecates the `-u` flag in favor of the `cargo update` command.